ae665d4b113487926358803e3ca9b0cd87d45856,server/src/com/cloud/vm/dao/UserVmDaoImpl.java,UserVmDaoImpl,listVmDetails,#UserVm#boolean#,344

Before Change


                    
                   
                    userVmResponse.setTemplateId(rs.getLong("vm_template.id"));
                    userVmResponse.setTemplateName(rs.getString("vm_template.name"));
                    userVmResponse.setTemplateDisplayText(rs.getString("vm_template.display_text"));
                    userVmResponse.setPasswordEnabled(rs.getBoolean("vm_template.enable_password"));
                    

After Change


            UserVmResponse userVmResponse = null;
            while (rs.next()) {
                if (userVmResponse==null){
                    userVmResponse=new UserVmResponse();
                    userVmResponse.setId(userVm.getId());
                    userVmResponse.setName(userVm.getDisplayName());
                    userVmResponse.setCreated(userVm.getCreated());
                    userVmResponse.setGuestOsId(userVm.getGuestOSId());
                    userVmResponse.setHaEnable(userVm.isHaEnabled());
                    if (userVm.getState() != null) {
                        userVmResponse.setState(userVm.getState().toString());
                    }
                    if (userVm.getDisplayName() != null) {
                        userVmResponse.setDisplayName(userVm.getDisplayName());
                    } else {
                        userVmResponse.setDisplayName(userVm.getHostName());
                    }
                    
                    //account.account_name, account.type, domain.name, instance_group_vm_map.group_id, instance_group_vm_map.id,"
                    
                    userVmResponse.setAccountName(rs.getString("account.account_name"));
                    userVmResponse.setDomainId(userVm.getDomainId());
                    userVmResponse.setDomainName(rs.getString("domain.name"));
                    
                    userVmResponse.setGroup(rs.getString("instance_group_vm_map.group_id"));
                    userVmResponse.setGroupId(rs.getLong("instance_group_vm_map.id"));
                    
                    //"data_center.id, data_center.name, host.id, host.name, vm_template.id, vm_template.name, vm_template.display_text, vm_template.enable_password, 
                    userVmResponse.setZoneId(rs.getLong("data_center.id"));
                    userVmResponse.setZoneName(rs.getString("data_center.name"));
                    
                    if (show_host){
                        userVmResponse.setHostId(rs.getLong("host.id"));
                        userVmResponse.setHostName(rs.getString("host.name"));
                    }

                    if (userVm.getHypervisorType() != null) {
                        userVmResponse.setHypervisor(userVm.getHypervisorType().toString());
                    }
                    
                    long template_id = rs.getLong("vm_template.id");
                    if (template_id > 0){
                        userVmResponse.setTemplateId(template_id);
                        userVmResponse.setTemplateName(rs.getString("vm_template.name"));
                        userVmResponse.setTemplateDisplayText(rs.getString("vm_template.display_text"));
                        userVmResponse.setPasswordEnabled(rs.getBoolean("vm_template.enable_password"));
                    }